From ee7ddefce952399f07edbeab465617c98fdccb18 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 25 Oct 2016 16:04:01 -0400 Subject: [PATCH] Remove deprecated gdk_display_list_devices --- docs/reference/gdk/gdk4-sections.txt | 1 - gdk/gdkdisplay.c | 38 ---------------------------- gdk/gdkdisplay.h | 3 --- 3 files changed, 42 deletions(-) diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt index 151b46f476..6e547c7726 100644 --- a/docs/reference/gdk/gdk4-sections.txt +++ b/docs/reference/gdk/gdk4-sections.txt @@ -115,7 +115,6 @@ gdk_display_has_pending gdk_display_set_double_click_time gdk_display_set_double_click_distance gdk_display_get_pointer -gdk_display_list_devices gdk_display_get_window_at_pointer gdk_display_warp_pointer gdk_display_supports_cursor_color diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index df073b6f8c..c38014c8c8 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -1686,44 +1686,6 @@ gdk_display_supports_input_shapes (GdkDisplay *display) return GDK_DISPLAY_GET_CLASS (display)->supports_input_shapes (display); } -/** - * gdk_display_list_devices: - * @display: a #GdkDisplay - * - * Returns the list of available input devices attached to @display. - * The list is statically allocated and should not be freed. - * - * Returns: (transfer none) (element-type GdkDevice): - * a list of #GdkDevice - * - * Since: 2.2 - * - * Deprecated: 3.0: Use gdk_device_manager_list_devices() instead. - **/ -GList * -gdk_display_list_devices (GdkDisplay *display) -{ - g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL); - - if (!display->input_devices) - { - GdkSeat *seat; - - seat = gdk_display_get_default_seat (display); - - /* For backwards compatibility we only include pointing - * devices (the core pointer and the slaves). - * We store the list since this deprecated function does - * not transfer the list ownership. - */ - display->input_devices = gdk_seat_get_slaves (seat, GDK_SEAT_CAPABILITY_ALL_POINTING); - display->input_devices = g_list_prepend (display->input_devices, gdk_seat_get_pointer (seat)); - g_list_foreach (display->input_devices, (GFunc) g_object_ref, NULL); - } - - return display->input_devices; -} - static GdkAppLaunchContext * gdk_display_real_get_app_launch_context (GdkDisplay *display) { diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h index 744652c257..109158413a 100644 --- a/gdk/gdkdisplay.h +++ b/gdk/gdkdisplay.h @@ -65,9 +65,6 @@ void gdk_display_close (GdkDisplay *display); GDK_AVAILABLE_IN_ALL gboolean gdk_display_is_closed (GdkDisplay *display); -GDK_DEPRECATED_IN_3_0_FOR(gdk_device_manager_list_devices) -GList * gdk_display_list_devices (GdkDisplay *display); - GDK_AVAILABLE_IN_ALL GdkEvent* gdk_display_get_event (GdkDisplay *display); GDK_AVAILABLE_IN_ALL -- 2.30.2